From 7d71fa25941d431a503979c4230418522a6be1b5 Mon Sep 17 00:00:00 2001 From: Soeren Sandmann Date: Mon, 23 Aug 2004 15:51:44 +0000 Subject: [PATCH] Remove conflict markers. Mon Aug 23 17:33:52 2004 Soeren Sandmann * ChangeLog: Remove conflict markers. --- ChangeLog | 1 - ChangeLog.pre-2-10 | 1 - ChangeLog.pre-2-6 | 1 - ChangeLog.pre-2-8 | 1 - 4 files changed, 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 141a751952..2d4373e380 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1608,7 +1608,6 @@ Mon Jul 12 00:52:04 2004 Matthias Clasen items. (#102530, #68015, #109811, Jordi Mallach, Benjamin Otte, Michael Opdenacker) ->>>>>>> 1.5542 Sun Jul 11 15:24:03 2004 Soeren Sandmann Bug 143330, support update counter spec. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 141a751952..2d4373e380 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1608,7 +1608,6 @@ Mon Jul 12 00:52:04 2004 Matthias Clasen items. (#102530, #68015, #109811, Jordi Mallach, Benjamin Otte, Michael Opdenacker) ->>>>>>> 1.5542 Sun Jul 11 15:24:03 2004 Soeren Sandmann Bug 143330, support update counter spec. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 141a751952..2d4373e380 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1608,7 +1608,6 @@ Mon Jul 12 00:52:04 2004 Matthias Clasen items. (#102530, #68015, #109811, Jordi Mallach, Benjamin Otte, Michael Opdenacker) ->>>>>>> 1.5542 Sun Jul 11 15:24:03 2004 Soeren Sandmann Bug 143330, support update counter spec. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 141a751952..2d4373e380 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1608,7 +1608,6 @@ Mon Jul 12 00:52:04 2004 Matthias Clasen items. (#102530, #68015, #109811, Jordi Mallach, Benjamin Otte, Michael Opdenacker) ->>>>>>> 1.5542 Sun Jul 11 15:24:03 2004 Soeren Sandmann Bug 143330, support update counter spec. -- 2.30.2